merge trunk
authorKenichi Handa <handa@etlken>
Mon, 10 May 2010 04:14:21 +0000 (13:14 +0900)
committerKenichi Handa <handa@etlken>
Mon, 10 May 2010 04:14:21 +0000 (13:14 +0900)
commitc1dddd629223cd26dca2ff5e5abd3e74b6cbf49e
tree639b6d9c0621ccaf1bd1f43f13a4dea63e952ebd
parent48b4e43cfb32174510f96fd92acf536a595d4f9e
parent8be7d18f83d2f9812f76387302bacf96ac27a9a7
merge trunk